GtkGrid: gtk_grid_get_size_for_size() do not dereference a NULL pointer.
authorJuan Pablo Ugarte <juanpablougarte@gmail.com>
Thu, 1 May 2014 22:54:10 +0000 (19:54 -0300)
committerJuan Pablo Ugarte <juanpablougarte@gmail.com>
Thu, 1 May 2014 22:54:43 +0000 (19:54 -0300)
gtk/gtkgrid.c

index 69d29f4fccb6a9c5080bee0742c8fa57cc131b74..5c93571ccf99c1ded96c914413e05e3ffc36eb5c 100644 (file)
@@ -1459,7 +1459,7 @@ gtk_grid_get_size_for_size (GtkGrid        *grid,
 {
   GtkGridRequest request;
   GtkGridLines *lines;
-  gint min_size;
+  gint min_size, nat_size;
 
   if (minimum)
     *minimum = 0;
@@ -1486,7 +1486,7 @@ gtk_grid_get_size_for_size (GtkGrid        *grid,
   memset (lines->lines, 0, (lines->max - lines->min) * sizeof (GtkGridLine));
 
   gtk_grid_request_run (&request, 1 - orientation, FALSE);
-  gtk_grid_request_sum (&request, 1 - orientation, &min_size, NULL, NULL, NULL);
+  gtk_grid_request_sum (&request, 1 - orientation, &min_size, &nat_size, NULL, NULL);
   gtk_grid_request_allocate (&request, 1 - orientation, MAX (size, min_size));
 
   gtk_grid_request_run (&request, orientation, TRUE);